auto merge of #140 : rust-lang/cargo/release, r=carllerche
authorbors <bors@rust-lang.org>
Mon, 7 Jul 2014 22:29:56 +0000 (22:29 +0000)
committerbors <bors@rust-lang.org>
Mon, 7 Jul 2014 22:29:56 +0000 (22:29 +0000)
1  2 
src/cargo/core/manifest.rs
src/cargo/ops/cargo_rustc.rs
src/cargo/util/toml.rs
tests/test_cargo_compile.rs

Simple merge
Simple merge
Simple merge
Simple merge